Merge "Migrate redirectToFragment() from wikibits.js to own module"

[lhc/web/wiklou.git] / includes / Article.php

diff --git a/includes/Article.php b/includes/Article.php
index e7a1188..42ed58f 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1438,7 +1438,7 @@ class Article implements Page {
 
                if ( $appendSubtitle ) {
                        $out = $this->getContext()->getOutput();
-                       $out->addSubtitle( wfMessage( 'redirectpagesub' )->escaped() );
+                       $out->addSubtitle( wfMessage( 'redirectpagesub' )->parse() );
                }
 
                // the loop prepends the arrow image before the link, so the first case needs to be outside
@@ -1610,6 +1610,10 @@ class Article implements Page {
                $outputPage->setPageTitle( wfMessage( 'delete-confirm', $this->getTitle()->getPrefixedText() ) );
                $outputPage->addBacklinkSubtitle( $this->getTitle() );
                $outputPage->setRobotPolicy( 'noindex,nofollow' );
+               if ( $this->getTitle()->getBacklinkCache()->hasLinks( 'pagelinks' ) ) {
+                       $outputPage->wrapWikiMsg( "<div class='mw-warning plainlinks'>\n$1\n</div>\n",
+                               'deleting-backlinks-warning' );
+               }
                $outputPage->addWikiMsg( 'confirmdeletetext' );
 
                wfRunHooks( 'ArticleConfirmDelete', array( $this, $outputPage, &$reason ) );